new style + cleanup