Added disposal, removed else blocks