More concise; handled one edge case