#51 update refactoring-issue