Fixing comments and code highlighting