Clean up indentation, remove incorrect comments.