Tidy up reading in of arguments