refactor issues