Content wrapper ver 1.0.5
Minor: code review