[~]  refactoring entryPoint