some refactoring of existing code