Simplify makeFace and fix a minor error