- Cleaned up code