Cleaner code

- Optimization
- Cleaner code