clean up + more doc