- Cleaning up a bit/adding comments
- Replaced the tuple by a separate data type with RenderData