removed empty else check