Cleaning up code a bit, simplifying comments.