file cleanup

no new functionality, just some cleanup in the file formatting, docblocks and whitespace stuff.