Change argument order
Some use tweaks
Doc tweaks
Remove now unused Helpers class