Further cleanup of JB stuff
Add code highlighting