Cleaned up whitespace handling.