clean up comments and order of imports