Update formatting to fit code conventions