[TASK] Clean up code

Code clean done with final modification