cleaned up some stuff