refactor fixes, only EISMINT not working