Fix code health.
Refactor.
Fix.