Adjusted indentation, cleaned up some comments