* Code formatting and version compatibility update