#7 refactoring