finished issue refactoring