Fix syntax/style issues