Slight cleanup/refactoring.