Brings the header mostly in-line with CLM

![upload](https://cloud.githubusercontent.com/assets/186715/4638417/2d660768-53fa-11e4-90a9-4bd23035257b.png)