Forgot to move function.
A bit more cleanup.