Clean up based on further feedback from @cheddar
better name, remove superfluous require
Use assign instead of 6 lines of conditions
Merge pull request #19 from tidepool-org/kjq/metrics3

Clean up based on further feedback from @cheddar