Fixed various styling issues

Made some changes agreed on in discussion, like getting rid of repeated headers.

Change-Id: Icadfede4d29c57cf87a7185868896ce3ff8c28fc
Merge "Fixed various styling issues"