In its own namespace, now code seems cleaner to me