Non-functional nitpick changes