Small cleanup to find root dir