Clean and refactoring source
Optimization