Updated changes

I have updated the changes to fit the libraries coding conventions