Refactoring and Doxing
task_1, task_2 : WIP