more find module standardization and cleanup