Minor cosmetic fixes to the code