Refactor init + add Marathon_ vars.