some cleanup of comments and print statements