Reverted whitespace changes, adjusted formatting to existing code