change reshape2 -> tidyr, cleanup