Make more pointfree