Cosmetic changes + styling.

Fixed merging garbage
No need for V7_PRIVATE if it's not in a header.