Made some clean ups