Do some refactoring: additional 2