Fix typo
Add entrypoints and minor refactor