1 13 cleanup

no significant changes here; just put everything in the format block.