Eng 4291 Final Expression-level refactoring phase, passes jenkins