Just cleaning up some stuff