Some refactor in Reflex

Reflex probably done.