Fix syntax/style errors