GPII-85, GPII-83: Linted files, fixed minor error