#6 #7 [CLEAN] Code cleaning
#6 #7 [CLEAN] Code cleaning
#6 #7 [CLEAN] Code cleaning
#6 #7 Pr comments fix