Simplified docker file a bit