Fixed remaining syntax and styles issues