refactoring day 1
FB & QB Chat & refactoring