Renamed class, made small refactoring