Refactor

Before: 0.512s
After: 0.296s