slight clean up of select