Updated comments and description