Another tidyup and move code to the //developer part