refactored Dockerfile