whitespace tweaks and other uselessness