Documentation + cleanup