Fixed whitespace issues