Refactored assignments outside of Factor