(REFACTOR) started migration to underscore methods