Initial code for a small refactoring exercise