Use YCM; some usability/formatting improvements