fixed naming and formatting issues