Refactored code to remove extraneous tags from header