Refactors assignments on inidicators logic.