minor work + cleanup