issue#9 clean up

issue#9 clean up