[TASK] Improve code quality

Change-Id: I96461fc607e277450a7951f6fa6c448471093f22