Syntax cleanup on JSV