Added Syntax highlighting & cleanup demos