cosmetic
rafctored out WorkingDirectory