Small fix + cleanup