Version 2.0.0.7

Cleaned the code.