Initial Clean up - fix #8