Removed an superfluous condition and repetition

Left in expired? for clarity
Added missing text and refactored some repetition