Changes to Model class and cleaned up book list