Small refactor of variable names.
Add some points of colour to make it easier to look at.