Remove un-used import
Fix the inheritance to use the proper class name
Fix code style