fixing headers poblem
pep8 enhancements