chore: rebase with main branch, cleanup code

chore: rebase with main branch, cleanup code #88