#6 #7 [CLEAN] Code cleaning