Fix to specs.
Code cleaning.