Refactored typedef a bunch including curryed calls