Little more clean up and refactoring.