Initial demo
Code clean up