Updating to coding convention