Continued refactor for Aristotle Library Apps