ISSUE #004 code clean up