Removed superfluous parens, adjusted tabbing