Do some refactoring