Removed the need for the else clause