Refactor ExtractMethod