590 (590) Move assignments to function call