Renamed and added comments