Improved FF bookmarks reading + code cleanup