(ONGOING) Code Refactoring
Code refactor part I [classification]