[TASK] Minor improvements and cleanups in messages sent