Minor modifications to coding style