pull request with cleaned up headers file