Code Fix  & Comment