Trying to fix whitespace issues