added refactoring exercise
merged ideas