Cleaning Up Header Code