Syntax cleanup
Update version