Code cleanup and transformer instances