Removed old code, removed unnecessary parentheses.