Refactoring suggestions for Dec24th, light code cleanup.