Cleaning up code/comments.