Refactor of xy points into ints from floats