PEP8 compliance.
Improve logging and error messages.
Add w/s to stay compliant with old implementation.