Remove unnecessary white-spaces