quality: Cleaning code (1/2)

First pass to clean code to let 'make quality happy'