transforms, fixing up various formatting and consistency things