- Cleaned code