cleaned up some stuff.