Reviewing the consolidation code [#389]