comments and clean up