[#68] Consolidation

...