'const' placed appropriately.
Tidying, some additional 'const' placement