How to refactor and optimize function