Did some clean ups