more cleanup. I like point-free style :-)