Refactor to add downcase method