Remove extra spaces and fix indentation