Improve efficiency (33/48)

Improve efficiency