remove unnecessary comments, clean up the code