Misc small updates to follow conventions

Hi Danijel,

This PR mainly has a number of small tweaks to follow various conventions, and should make the dist "CPANTS clean".

Cheers,
Neil