improved pep8 compliance
improved TZ handling