Refactor for meaningful namingness.