Refactored Format and Chat

F and C