More Code, Some Refactoring.