refactoring (temporary file for evaluation, fixed issue #7)