Cephalopod funder dev and refactoring macros to typedefs