Minor tweaks to improve code style