Cleanup and better Dockerfile