User migrate cleanup

Just some small changes to clarify functionality. Check it out @tomneedham