more refactoring to meet DEFI standards.