Tidy up some comments and initialisation