Some cleanup action to get the number of quality check issues down
I did theses initially in another MR but now moving them here to unclutter the unrelated MR.
I did theses initially in another MR but now moving them here to unclutter the unrelated MR.