enh: refactor how FE/RE handled for consistent model