insert Comment's & Refactoring