Add command line --tree option and remove hardcoded boolean