Classes spilt and output strings more tidy