added to buildHeader() and cleaned up
added to buildHeader() and cleaned up