Move more logic into constants file