Whitespace and formatting fixed