file cleanup, minor style tweaks