Renamed class file
Updated code standards