more tweaks as per feedback on pull request
style fix