Just tidied up some output and removed the chance of some ValueErrors