Code refactor.
#70: changes for future bookmarklet and feed discovery implementation.