Refactor... See https://github.com/ClipperCMS/ClipperCMS/commit/e211b9dc49b2793a9f4ce269b28cc4803a1ca725