Still cleaning project
Fixing comments