Code Cleaning

Version 0.1.0.8