Clean the code
Clean the spec
Cleaning code