Refactoring - first step