refac HelperTypes etc