Cleared up whitespace issues