Update comments and more semantic member names