Renamed class; fixed bug
Formatting fix