Clean up Servo formatting