Issue #0
code cleanup