Refactored to add functions everywhere
Refactored to add functions everywhere

Signed-off-by: Matt Bentley <1fa2ef4755a9226cb9a0a4840bd89b158ac71391@docker.com>

jcderr/migrator,pcorliss/migrator,docker/migrator,mbentley/migrator,wangyumi/migrator