More coding convention changes  #19