remove subject type, refactore some output to be more closer to godoc