- Cleaned up the code