Help cleanup and expandions + moving to magrittr 1.5