Small refactor to define all methods locally then expose the appropriate
ones

closes #16