A tad more cleanup