ECM Refactor
Removed var_dump
Missing copyright
Merge pull request #855 from marcosgdf/minor-refactor

ECM Refactor