Efficiency

Improves previous commit.