Issue #10; DRY code