* Remove comma thousands formatting * Add calorie and bpm to units * Updating device and state classes * Revert "Updating device and state classes" This reverts commit ae77cf3cd74bf3e09ac70a0a4be4a73e0f7d3223. * Revert "Add calorie and bpm to units" This reverts commit 7d82bb1c1231ef4c45ca08dda5d30d10c9a0c0a0. * Removing unnecessary formatting