One more cleanup
Final cleanup, now handles full book list (but no filter)