Issue refactor