Fix syntax error and codestyle from recent PR merge