More code style changes indicated by Don