Kale Automated Fixes [ Remove return in single expression arrow functions ]

[DomAmato]

Our automated tool found some changes for simplifying things using one of the added ES6 features.

For an arrow function, it replaced the curly braces and return statement with a direct value or expression. Should help compact the code and reducing nesting

[cos]

@toish, when you get a chance, can you have a look at this PR?