Cleaning up more code/comments.