Adjust code layout and syntax highlighting /issue #3