Refactor minor style formatting in places

okay, also sneaks in a missing global object for importing elsewhere,
but it's a minor feature nobody is using yet.