Issue #49 - fixed Date and ExpireDate checking logic
Cleaned up PEP8 and Flake8 formatting errors.