Small cleanup to #14 before big refactor