Final 1.5

- Commented
- Cleaned up