Further set of cosmetic fixes to comply with the coding style