Removed residue_shift option
Changed string formating with {}