Some slight tidying up of using system info