Did some cleanup before starting in too deep.