Minor cleanup before more commits to this file