Some code clean up
Added heading styling