Octospy refactor