Tidying
New style init.
Happy with generated code for the moment
Tidying