refactoring

committing missed refactoring