Remove whitespace issues