#52: a tad of clean up