code clean up
fix headers