Some more cleaning... Needed to refactor the nif interface