fixed naming convention, improved formatting