Minor tweaks to fit coding style