fix: improve efficiency