modified class name and formatting