refactoring issues solved