Two bugs

Fixing repeated code and removed random message send