Change to general function lookup for styling
Fix typo in demo
Update test cases
Minor change to demo styler