validator and social share refactoring