ISSUE #004 code clean up
ISSUE #005 code clean up