Clean and refactoring source