minor + cleanup