Rewrote some functions point-free

We have the functional tools, might as well use them.