Git Driven Refactoring

Refactoring