Updated the grammar and related items
Introduced clean as part of the whole project