small fix + cleanup