More code cleanup, using point-free style where applicable