Cleanup and change to setMakeDirectory()