Revert Refactoring

Refactoring buried variables previously easily accessible.