Refactoring suggestions for Dec24th, light code cleanup.

!! denotes issues for pairing session.
No code reordered or changed.