cleanup and move Constants to common
use garmin formatting