Cleaned up booklist