Do some refactoring: additional