updating to conform to coding conventions