Tweak for maintainability.