minor refactoring (varialbles name changed; etc.)
minor refactoring