refactoring - commenting & modify somethings