Make run_FE code more clean