renamed a class and formatting