fixed formatting and whitespace