Cleaning up some stuff