Made x,y more explicit.
Removed unneeded products.