replaced variable names throughout, deleted uncesseccary code