[TASK] Improve code quality

Change-Id: I979206622d75665a53a338c122fa86a7f0ea4bb9