More/cleaner communication handling