Add header and minor style changes