Clean up indentation to be more readable