Addthis refactoring, formatting