Refactor values, remove demo
0.1.1