documentation + more cleanup