Normalize whitespaces
Cleanup