fix demo dependencies sourcepaths
unify whitespace in code