Refactor - Make sure we have x and y the right way round