Modify constructor(); add comments