Refactor Helper