Minor formatting
Progress on syntax highlighting