Did a little code refactoring.