Small optimization

Closes #32