Fixed Whitespace issues