Proper whitespace handling