Updated comments and change method access