cleanup and Dockerfile highlighting