cleared up some header declarations