Removed unnecessary elsif,