- Shortened code
- Deleted commented out code