Tweak for clarity and consistency