Do some Refactoring.