Refactoring Dockerfile