Add downcase check and comment