[TASK] Improve code quality

Change-Id: I47410b1acf1c564113ed969590cc99e4f05bc260