cleanup/rework the ilepton logic