refactoring - again