Tidy up and add methods for retrieving path and name.