refactor code

Signed-off-by: Victor Vieux <vieux@docker.com>