Add some comments and remove extraneous whitespace