More changes to enable PEP-8 readiness + some small bug fixes
More changes to enable PEP-8 readiness + some small bug fixes