Unicode fix and renamed variables for context