Add online dating sites plus null guards.
Move some hardcoded values to "constant" variables; use definition property if available.