More code cleaning
Better logging
Cleaning up...
Refactoring examples