[#14] - more clean up