[TASK] Improve code quality

Change-Id: I2d303abf7871dab0908872ac064fa0727d644ba1