Dockerfile cleanup and formatting