Minor improvement, reuse context