documentation + cleanup