Change to highlight comments and end of regular lines