Code/docs cleanup, props @baweaver