removes spurious return value
Reorganises Dockerfile