Tidied up internal function usage  by removing default arguments