6.2 - A bit of refactoring