Removing xcuserdata from index
Removing need to specify named parameter
Less cells for now