Version 2.2

Clean the code 2.2