[Echo.Control] code style updates