Made commands more consistent so that the first run will be easier