Little refactoring of Comma + add the CKEditor ContentMaker