Added reflex namespace. Cleanup