Cleanup of whitespaces