remove weird function naming