Fixed more whitespace issues