Refactor optimizable