[++] compos / refactor