Fix spacing
Add todo
Better naming for some parameters in demo app