Cleaned up some comments and whitespace