quality: Cleaning code (2/2)

2nd pass to clean code to let 'make quality' happy