remove comments and some cleanup