cleaned up some...