Added defaults for all variables and removed files that I didn't need