Cleaning up, removing unnecessary comments.