- some refactoring issues