Consolidated some lines for Docker