Doing some cleanup here.
Clever solution to 116