Cleaned up

For clarity, syntax highlighting and to match the current version