minor fixes
Cleaning project