- Fixed some formatting
- Removed some commented out code