Renamed and cleaned comments