Further refractoring
Further refractoring