minor formatting tweaks
tuples for passing all coordinates