Demo Cleaned Up

Pending testing
Added Sonar code and crushed tabs