fixed formatting and tostring