Refatoring initial context