REFACTORING - CODE CLEANUP + FORMATING