cleanup, whitespace, comments & copyright