- cleanup some fairly awkwardly styled code
- lines too long, inconsistent comments, etc. etc.
- drop excess newline