A couple of coding style changes added to previous commit