ISSUE #005 code clean up