Fixed variable names
removed import due to Lady Cailin's fix