cleanup, nomenclature
style fixes