Added comments and setter and getter methods