Make the connected logic a bit cleaner.