Code cleanup/refactoring.  No functional changes