Trying to clean up value vs values