- Cleaned up messy code