Some cleanup here and there