Cleaned up some stuff associated with the new reward function