Code clean up to reflect for book system