Add a convenience cleanup method to reduce boilerplate
#67
+4
−0
cleanup method to reduce boilerplate
#67