Clean up trailing whitespaces and use 2 spaces indentation