cleaning up those ugly headers