Fixing indenting and whitespace