refactoring
another refactor
getting rid of old python helpers
trying to make things faster