corrected nonsingleton, solved issue #15 Refactoring