fixed naming and whitespace