fix style issues

based on comments from @BenClancy