cleaned up tonights work a little