refactoring - 1