Refactor

Reducing Function Size