WIP: Cleaner style, test transforms