Coding convention changes #19