Changed some variables and fixed some camel case