Fixed markup and formatting where required by jshint