Minor tidy up and commenting