Changed reward structure

Also removed types (all nominal)