removed unneeded functions and prepended _ to unused args