Improve efficiency (11/48)

Improve efficiency