style + cleanup