Made better variable names, fixed creation of names