Cleaning

- Cleaning code