Dev Mode: refractored code.