Refactoring, step 1. Not working version