Fixing whitespace issues