Minimal cleaning on the code

Project cleaned