Pull request for efficiency

Everything runs just a few potato faster.