removing comments, cleaning up