Dockerfile and minor cleanups
simpler naming