clean up and reward fix