Additional refactoring to correspond with FlossWare utils