Do some other refactoring.