Clean up Dockerfile for readability