minor fix + cleanup