Be more point free
Clean some things up