PEP8 fixes

Simplified date handling