Code Consolidation

Consolidation of code. Code consolidation.