Cleanup values.rs trying to make the code clearer (#700)

Cleanup values.rs trying to make the code clearer (#700) #303