Cleanup Whitespace/formatting
Fix 'eval cd ...' to support bookmarks with spaces in path