Added variables, crude formatting