moved namespace and execution of callbacks into helpers