Reformat: blocks -> super() has space and some abc-ing