- Cleaned up code.