Modify to conform to project code conventions