[Communication] Correct coding style and clean up