Update to match coding conventions in project