Refactor, coverage and Lint
.gitignore added Eric files