Moved functions to local eex namespace + corrected mispelled DATASETs