working on a refactor to naming standards