Today's work -- mostly some code cleanup