refactoring variables for issue #108