map controller magic numbers removal