Update demo system to meet coding standards
0.52.0