Renamed a few fields; added one comment