Cleanup and formatting. Added stuff for OmniCppComplete