Cleaned up Dockerfile to make it easier to read