Refactoring issue 24