Refactor - Simplify code