Clean-up. Enclosed some functions and statements in parentheses.