updated syntax to be more consistent. Changed highlighting method