- Clean up code.
- Added more comments