Completed excercise 'Make it modular', my version