[TASK] Code Cleanup - #82