Minor transformer class clean