Fixed whitespace handling when removing comments