Fixes standards

All is in the title, and please see the commit log for details.

:nail_care: