Code clean up. Fixes rSK4bad0f8748ba