Clean up whitespaces
Clean up more whitespaces