Code reorganization and small refactor for clarity