Fix Whitespace and ending lines