Updated header layout and jshint fixes.