[TASK] Code and comment clean up