Fixing whitespaces