Removed 2x calls to same function