- Rearranging classes to ease understanding the code
- Debugging indexing classes