Minor tweaks related to coding style