Some meta work

First commit of this pull is just a bit of meta work... nothing interesting.