Renamed methods, restructured code