Code cleanup
Examples updates and some sonar adjustments
Example update