We're seeing this else case throughout the file. Could you please refactor it?