Fixing up some comments, indentation, etc.