tidy'd up a bit
oops
accidentally reverted commit. remade changes.