Add syntactic highlighting and refactor code
Fix bug
Fix group