Cosmetic changes + styling.

Fixed merging garbage
Sorry I misread the diff, looked to me as if was removed from the header as well.