Refactoring

Yes, its for non-yarn implementations