[#34] refactored current_scope