Add path and workdir
Delete trailing whitespaces