Clean up: remove whitespaces