Code cleanup
Use skdemo lib