Cleanup, self-librified, tidied