Fixed whitespace and formating