More refactoring, adjusting comments.
More refactoring, adjusting comments.

bdgio/msol-site,mozilla/openbadger,kayaelle/msol-badger,kayaelle/msol-badger,bdgio/msol-site,kayaelle/msol-badger,mozilla/openbadger,bdgio/msol-site