refactoring - 2