* Code reformatting and version compatibility update