Fixing some whitespace issues