style changes to address unneeded parens and using an implicit return