Issue #60 - A little bit of clean up.