Refactoring, adding facebook