Improve Code Quality
Merge commit 'd6350347602d2d6c65d138df80256dfebf1a504a'