Move assignment into proper block