Refactoring of Dockerfile