just some clean ups