Switched to using magrittr pipes