[refactor issues]