Refactoring.  Minor code cleanup