Fixed some whitespace issues
More whitespace fixing