Refactor setup/docker