resolved issue #4, cleanup