Refactor Dockerfile