fixing classes and formatting