Moving assignments out