move around code. no functional change.