more migration to using config instead of hard-coded values