Removed trailing spaces

Black text not visible #5291

Issue #5291 black text not visible

Optimized code

Lint error fix

Removed trailing spaces
Merge remote-tracking branch 'origin/master'