rename globals to active
typehint callable
re-namespace