Maintainability Refactor
Refactor pt 2