Remove redundant 'return' and braces