Fixed Comments and remove useless type declaration