Fixed more spacing and tabing issues