add formatting for definitions
refactor demos