Refactor : Improved code organization