Fix indentation and remove whitespace