Code clean up Issue #5