Renamed and wrote comments