Updated comments and toString method