Refactoring various.