Moving code around is a red-flag for me.  This is maybe fine, but check with @mjschranz.