Refactored assignments