Fix variable names.
Merge branch `cleanup` into `master`.