Correct formatting and  improved toString methods