Performance

Eliminated some unnecessary calls

@BrettASwift @kadst43 would you mind reviewing?