Issue 18, cleanup
Issue 17