Clean a couple of things up using 'map'.