Slight Clean-up

Some very slight clean-up and removal of unneeded brackets.