further refactoring of the Pharmgx normalized model and usage model