Extended.
Cleaning the code.