Some indentation fixes and the removal of some superfluous parens.