some cleanups in formatting and adjust to old phpcr-odm bc breaks