fixed naming and spacing