Refactoring - 1