Tad more cleanup