last refactoring/check before returning this assignment