clean up comments and hoisting