Cleaned up an assignment operation
Refactored to be functional