Small refactoring
Fix lint
Module exports