Refactor extension - make methods smaller