[Task] Code Refactoring
[Task] Code Refactorings

* develop:
  [Task] Code Refactoring