Some codeclimate checker issues escaped from the code review
and are now merged, fixing them here.

Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>