Small cleanup using anonymous functions
Named arguments shorthand