Code commenting and nomenclature improvements