Do a little bit of refactoring.