exception handling changed to Python 3 & PEP 8 changes