- Cleaning more code