Cleanup, renaming, commenting, and rationalisation
Cleanup, renaming, commenting, and rationalisation