Refactoring issues.