Bro: Removed variable
and minor improvements
#3186
Merged
variable
and minor improvements
#3186