invert tests to remove nil? calls
rename -to- functions to use -> to represent a transformation