Cleaning

The code have been modified a little.