* Version compatibility update
* Minor code formatting