Did very minor refactoring.