Gave more curves to arrows and cleaned up code