Put init and remote add outside the conditional