minor tweaks to enforce consistent coding style