Reorganized Dockerfile in order to reduce Docker layers and remove
useless space