A little bit of some refactoring.