Whitespace, remove commented code