Minor cleanup.  May still change...