Syntax and style fix