Correct indentation and remove the rest of the trailing whitespaces