Simplify code by using single-expressions functions syntax