#16 Simple refactoring