Some cleanup all around