Cleaning
Factored out control update from NRT, see #48