Fixed whitespace and formatting issues