[TASK] Fix several code style issues mentioned in scrutinizer

Change-Id: I44d527ae114306cbaf7984b00831f1a2af74dcb3