Remove unnecessary parentheses and use enumerate